Last commit broke everything, reverting back
Merge pull request #1 from nahkiss/v2

Last commit broke everything, reverting back