Added better support for overbars - issue #1