Improved office module
Merge branch 'master' of github.com:botherder/viper