Merged Justin's fixed into master
working on arm
working on arm
working on arm
Merged Justin's fixed into master