initial feature46 commit
renamed
corrected Makefile
Merge pull request #2 from elishowk/feature46

Feature46 corrections