Merge pull request #1 from bcaffo/master

Update from first pull
Merge pull request #30 from gugclo/master

Merge pull request #1 from bcaffo/master