Reverted a change I made previously - it causes too many problems
Merge pull request #5 from stevenhoneyman/master

Reverted a change I made previously - it causes too many problems