stacey's commit
Merge pull request #7 from stobrien/master

 stacey's commit