Merge pull request #26 from wshafer/master

Initial merge back to trunk