faulty merge
Merge pull request #6 from devosvictor/dev

just get things normal again