a bit more progress
Merge pull request #22 from xeno-by/master

a bit more progress