Fix a bug in getting the options
Fix also the makefile
Fix makefile mistake
Merge pull request #3 from djhaskin987/master

Update