Applying also the original Merge pull request

Applying also the original Merge pull request. The thing here is that I've change some aspects of the repository.:x

https://github.com/rosario/kasper/commit/93e0e76ad6645eae9dda0f8a2d2849be03278081

Contact info: joaquin@isla.io