Merge pull request #10 from draycox/master

getting everything up to date