Merge pull request #205 from zenspider/master

Fixes for my bugs