Merge working/Makefile into Makefile.
Merge pull request #4 from robru/master

Merge working/Makefile into Makefile.