commit
Merge pull request #24 from sandstroh/sandrosbranch

commit