Merge pull request #6 from alephtwo/master

Merge pull request #8 from novoalg/master
Merge pull request #9 from novoalg/master

Merge pull request #6 from alephtwo/master