ABC1 Merge pull request #3 from callmefirme/master

ABC2 Second Merge pull request #1 from callmefirme/master TST-3