Merge branch 'error'
Merge branch 'master' of github.com:tvxedo/sub-hack