Merge pull request #41 from e55k4y/dev

Bugfix