Worked on conditional messages
Merge pull request #26 from Elwend/master

Worked on conditional messages