Add updates from user adamvaughan about 10 months ago
Merge branch 'develop'