History fixing + Parser fixing
Merge branch 'master' of https://github.com/mabm/jsh