Merge pull request #4 from alephtwo/master

Pulling ben's version
Merge pull request #7 from novoalg/master

Merge pull request #4 from alephtwo/master