Fixed a bug that caused a fatal error
Version bump
Merge branch 'Develop'