Merge pull request #14 from tanyafish/master