Malabarba Merge pull request #22 from ikirill/master