Merge pull request #34 from LeoMcA/master

Fix merge conflict [fixes #31]