Intermediate additions..untested
Merge branch 'master' of https://github.com/nikunjy/bayou
More modifications...still untested