Merge pull request #20 from phaseIV/master