Merge pull request #2 from callmefirme/noel

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

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