alketh Merge pull request #31 from rgirardi/master