Merge pull request #1 from ftakacs/0.x

0.x
Merge pull request #2 from ftakacs/master

Merge pull request #1 from ftakacs/0.x