some bugfix
Merge pull request #4 from sgrastar/working-branch-for-Alpha3

some bugfix