Small revisions
Merge pull request #11 from danaw/master

Small revisions