Merge pull request #20 from wshafer/master

Initial merge back to trunk