kriszyp Merge pull request #1 from cabo/master