Merge pull request #2 from brawner/master

Further refactoring and renaming
fixed proj
Merge pull request #3 from markkho/master

New changes from mark