Merge pull request #64 from alexgrin/master