Improved setup in makefile
Merge pull request #25 from kirang89/master

Improved setup in makefile