Merging into Master

I was committing to master... oops! Now I am committing to develop and merging into master. Hooray!