Start implementing option updates
Merge branch 'master' of github.com:phung/dicis.io