Merge pull request #2 from seanneal/master

pull down the latest
Merge pull request #2 from emshon/master

Merge pull request #2 from seanneal/master