Fixed warnings for 'pedantic' option.
Merge pull request #2 from literator/mymaster

Fixed warnings for 'pedantic' option.