Merge pull request #26 from pmienk/master

Refactor to nonrecursive makefile