Merge pull request #8 from novoalg/master

Wat