Merge pull request #1 from tanyafish/tanyafish-patch-1