Merge pull request #11 from alexevans/master

added lots