Merge branch 'master' into dev
added mark and goto for files with -f command
Merge branch 'dev'
Merge branch 'master' of https://github.com/whtevn/gotomark