pavanky Merge pull request #7 from mlloreda/patch-1