Merge pull request #39 from lrupp/master