rdnetto Merge pull request #132 from burlog/patch-1