Merge pull request #2 from mockdeep/branchB

Branch b
commit from master