Merge pull request #1 from buysellads/master

Merge from BSA's account