Updates.
Fixed bad version code.
Merge branch 'develop'