Merge pull request #4 from 30x/ad-hoc-fixes

Ad hoc fixes