mmenestret Merge pull request #19 from nachinius/patch-2