fixes #310
Merge pull request #313 from aaemnnosttv/Dev

fixes #310