Merge pull request #4 from goodwordalchemy/master

second edit
Merge pull request #5 from goodwordalchemy/second-edit

Merge pull request #4 from goodwordalchemy/master