Makefile improvements
Document Makefile usage
Merge branch 'docs'
Revert "Fix for issue #3"

This reverts commit ac8261d44772b493df62568fbf736c5d33bbe8cd.