This was doing stupid stuff, now it is a bit smarter.
readibility
Merge pull request #7 from ftlabs/bugfixes

This was doing stupid stuff, now it is a bit smarter.