Fix backwards compatibility with previous versions
Merge pull request #1 from uksb/Hotfixes

Fix backwards compatibility with previous versions