Merging Into Master

All commits are set to go!