Merge pull request #39 from Ralith/master

Extensive fixes, updates, and a low-level wrapper
Merge remote-tracking branch 'scottgw/master'

Conflicts:
	base/cbits/extra.cpp