Issue 258

Dinis,

I doubt you'll want to pull these changes but I'm raising a pull request to help me keep track of changes I'll need to merge back into later, 'cleaner' pull requests.

Kofi
http://twitter.com/wimirotech
http://wimiro.com/blog