Minor changes
Merge branch 'master' of github.com:jpercent/unlock into kansas
Merge branch 'kansas'