Fixed argument replacement
Test: better colors
Test: cleaner indentation
Test: more clear invalid input
Merge branch 'develop' into buffer