Merge pull request #16 from relip/master

Merge from master branch
Merge branch 'dev' of github.com:relip/depot