Merge pull request #3 from r2vq/master

Merge pull request #2 from r2vq/release-0.1
Merge pull request #4 from r2vq/develop

Merge pull request #3 from r2vq/master