Merge pull request #21 from phaseIV/master