I dedicate this commit to the new pope.
Merge pull request #14 from ancagrosan/master

yet another merge