Merge from master
Merge branch 'master' of https://github.com/EddyBeaupre/armStrap

Merge from master