Merge pull request #11 from Hasimir/master

The joy of github user content
Merge pull request #12 from Hasimir/master

0.2 final