Merge pull request #10 from mmunz/upstream