samn Merge pull request #1 from stefnotch/patch-1