edit_taim_fix
Merge branch 'master' of github.com:reminate/vrin2014