Merge tag '1.0.2' into develop

Made release 1.0.2
Fixed some parsing errors and added debug
Updated version number
Merge branch 'release/1.0.3'