Merge pull request #5 from xerial/develop

Merge changes from upstream
Change classes directory in Makefileto fix compilation.
Merge pull request #77 from ibmsoe/modify-makefile

Modify makefile