updates! :D
Merge branch 'develop' of github.com:ReactiveRaven/flaming-octo-archer into develop