Merge pull request #2 from emshon/master

Merge pull request #2 from seanneal/master