Merge pull request #2 from uksb/Hotfixes

Fix backwards compatibility with previous versions
Merge remote-tracking branch 'origin/Develop'
Merge pull request #4 from uksb/master

Upadte