Merge pull request #14 from alephtwo/master

ben's changes
Merge pull request #24 from novoalg/master

Merge pull request #14 from alephtwo/master