Issue #3 as well as adding Unicode statements