Updates.
Merge branch 'master' of github.com:blockjon/octopus