Merge pull request #4 from goodwordalchemy/master

second edit