round one
done
Merge branch 'develop' into cleanup
Merge pull request #487 from john-hill/cleanup

Cleanup