Merge pull request #14 from dimdin/master

replace ? only in the correct context, resolves issue #13