Second clean merge attempt
Merge pull request #4 from germanop/germano

Second clean merge attempt