Fixing some nasty bugs.
Merge branch 'master' of github.com:sjlu/bar-hop