Merge pull request #5 from zootreeves/master