Improving conditionals and adding more tests
Releasing 0.2.0