baseline commit
Merge pull request #3 from danrharms/trunk

baseline commit