Merge pull request #6 from zootreeves/master