Merge pull request #16 from Rob4001/master

Small Hotfixes