Merge pull request #5 from mmunz/master