Merge pull request #2 from xaviervia/develop

v0.1.0
Merge branch 'master' of github:xaviervia/locco into develop