added more
Merge pull request #3 from crenwick/dev

added more