Merge pull request #3 from callmefirme/master

Second Merge pull request #1 from callmefirme/master TST-2
Merge pull request #5 from callmefirme/noel

ABC3 Merge pull request #3 from callmefirme/master TST-3