Merge pull request #1 from oblique/master

Merge updates in origin repo