improved simplifier
lolwut
some comments added
some new testes
new stupid comments
test
clean
Merge branch 'master' into powerful