Fixed some compiler warnings.
Merge branch 'Release_1.0.0'