Merge pull request #25 from LAFcaptstone/steves

Steves