Merge pull request #1 from clahub/master

Merge from master