Merge pull request #101 from mreist/master

Getting Master