merging rickys wanted changes from dev into master