add history support
Merge branch 'master' of github.com:dolymood/M