Merge pull request #1 from senseidb/master

Merge changes from senseidb:master