Merge pull request #38 from primefocusworld/pull_request_180913

Fixes #39, fixes #40, fixes #41, fixes #42 Pull request 180913