Updated to latest version
Merge remote-tracking branch 'refs/remotes/github.com/master'