Roo 3500

Hi @eruiz,

I'm trying for a cleaner pull request this time - from a topic branch.

Also, this fix contains additional fixes which should address the problem you noticed in the previous pull request #77 

Still learning git, so let me know if you see any problems with this go around.

Enjoy!