2color Merge pull request #32 from keonik/master