Merge pull request #122 from strangeman/master