Fix issue LemonBoy/bar#25
Merge pull request #26 from boblehest/master

Fix issue LemonBoy/bar#25
Take BAR_OFFSET into account. Fixes #29.
Merge pull request #1 from LemonBoy/master

Update from LemonBoy:master