20131213 mod by norita
20131213 mod by norita
Merge branch 'issue-1111'
Merge branch 'master' of github.com:MedibaWorkshop/workshop_F