Merge pull request #27 from pantheis/master

Get this stuff balanced...