More hackery
Merge branch 'master' of github.com:doismellburning/wheresupdoc