Readme
Added some simple tests
Merge branch 'v1'
Revert "Readme"

This reverts commit 9bef82817d8de3c284b7d76489cf5990b47b089d.
Removed unnecessary elseif
Removed unnecessary elseif
A little refactoring
Merge refactoring from v1