Merge branch 'master' into develop
Made some small changes to setPositions method
Added basic instructions
Merge branch 'develop'