Merge in with remote.
Small bug, need to change a variable
Merge pull request #240 from dovy/master

One small bug.