References #121
Merge pull request #294 from santiagopuerta/patch-1

References #121
Merge branch 'master' of https://github.com/JJ/GII-2014