Merge pull request #25 from blinken/master

Ok so this should probably have happened several months ago, sorry y'all
One more late solution for 0x06