Merge pull request #913 from narfbg/develop-issue-863

Fix issues #11, #183 & #863