WIP
Merge pull request #11 from mietek/master

WIP