More goodies...
Merge pull request #24 from douggr/master

More goodies...