some more progress
Merge pull request #3 from xeno-by/master

some more progress