Merge branch 'master' into develop
fix issue found on iPod
add installation instructions in the readme
Merge branch 'develop'