Updates
Merge branch 'master' of git@github.com:drake1701/addons.git