Issue 3: fixing attempt

This is based on #7 - I've added one more specific test and arguments escaping.