Edit function works
Merge branch 'master' of github.com:shinsato/ultme