Merge pull request #35 from daeronmeyer/master