Fixed reshape function
Merge branch 'master' into develop
Change project structure