PB2
Added tests
Merge pull request #2 from PeterBell/pb2

PB2