Merge pull request #22 from Korovyov/master

this isn't done yet
this cannot work