further adaptation
Merge pull request #29 from xeno-by/master

further adaptation