Fixes Issue #19

This might interfere with the pull request for issue #18

The fix is live on http://boundstar.com/status and works well for me.