Fixed warnings for 'pedantic' option.
Merge branch 'master' of github.com:literator/Typhoon into literator-master