Merge pull request #3 from vpixle/patch-1