fippo Merge pull request #58 from fippo/master