Fixing several warnings given by pedantic g++-4.8.2
Merge pull request #74 from ddemidov/master

Fixing several warnings given by pedantic g++-4.8.2