Merge pull request #70 from SupunS/master

project handling added
Merge remote-tracking branch 'upstream/master'