bugfixes
Merge pull request #1 from cTn-dev/master

merge