Fix compilation error on Ubuntu 14.04 (gcc > 4.7).
Merge pull request #50 from domob1812/fix-14.04

Fix compilation error on Ubuntu 14.04 (gcc > 4.7).
Merge pull request #53 from domob1812/fix-typo

Fix typo.