Merge pull request #13 from alephtwo/master

Ben's changes
Merge pull request #16 from novoalg/master

Merge pull request #13 from alephtwo/master