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