Pulling development changes into master.

Still leaving the development branch open though because it requires more updates and changes.