Merge pull request #77 from ndawe/master

Makefile improvements
more Makefile improvements
fix docstrings