Merging Dev Branch to Master

Getting both branches up to date