Merged change of commit 2b3c6cbc0ff2b6b1a1b795c2705ae41537345970 from adhocrcay/develop into user/edit.html to fix #92