Beta 1
Merge branch 'dev' of https://github.com/tyduptyler13/PlugPlus into dev