Merge branch 'dev' of https://github.com/whtevn/gotomark into dev