Marzac Merge pull request #2 from farvardin/patch-1