Merge pull request #1 from pansit/master

This should be a better startingpoint
Merge pull request #2 from pansit/master

Changed LDFLAGS in Makefile
Added comments