[TASK] Added validation messaged - Closes #43
[TASK] Small patches from Scrutinizer