stash branch
Merge pull request #63 from ricarora/style

stash branch