Merging Dev into master

![](http://media.giphy.com/media/1rPE9rqCkJaUM/giphy.gif)