This reverts merge request !46 (merged)
Mentioned in commit e1df7dbe
Status changed to merged
Fixed @tiago.pereira :D