Fixed #55 Fixed #54 Fixed #53
Merge pull request #56 from NBot/issue-53

resolves #55 resolves #54 resolves #53