Fixed Few bugs
Merge branch 'master' of ssh://git@github.com/kryptick/bbbay.git