merge to master
Merge branch 'master' of github.com:mitdbg/asciiclass

* 'master' of github.com:mitdbg/asciiclass:
  merge to master