v0.6 dev
Merge pull request #1 from boiving/master

v0.6 dev