ticket:1 Fix for Makefile
ticket:1 Fix for makefile
ticket:1 Merging with master after Makefile was fixed