Merge pull request #3 from autorepo/master

fixed conflicts
update project property
Merge pull request #28 from ytfunpanda/master

updated project property