Merge pull request #77 from mgreter/master

Aligns build system with autotools build and travis-ci