Laying ground work
Merge pull request #1 from frankhale/master

Laying ground work