felipe vs stephentu
Fix merge conflict
jond v stephentu
Merge pull request #41 from stephen-turner/master

jond v stephentu