ongoing fixes
Merge pull request #5 from xeno-by/master

ongoing fixes