keeping up
Merge branch 'develop' of github.com:sapo/Ink into develop
Toggle simplified, won't mess with [style]
keeping up
updated some tests from other branches