A project through bugs fixes
Merge branch 'develop'