Merge pull request #14 from SlashRoot/master

Clean merge of James' Damon's, and my work.
Update AUTHORS

Added Damon.