BALD MAN
Fixed merge conflicts
Merge pull request #26 from NarPar/master

BMAN