Fixed merge for bugs #3 and #9
Update Makefile to 5.1.5