Merge origin/master into 0.1
Merge pull request #2 from zinopu/0.1

0.1