A little bit of integration
Merge pull request #7 from joel-sparc/misc

A little bit of integration