Development

Merging my recent work from dev into master.