Revert "Merge pull request #223 from ximex/master"

Merged this by mistake.  Shouldn't have merged this into stable branch.