Fix issue when using apostrophes, close #35