My new year resolutions :)
Merge pull request #32 from carlosazaustre/master

My new year resolutions :)