Merge pull request #10 from peak3d/patch-1