tehn Merge pull request #2 from jemfiner/master