Fixed compile warnings.
Merge branch 'master' of github.com:plimber/cem