rollback on makefile
Merge pull request #89 from snordt/master

rollback on makefile