Merge pull request #2 from emshon/master

Merge pull request #2 from seanneal/master
Merge pull request #3 from seanneal/master

Merge pull request #2 from emshon/master