Fixed #50 - MOAR VALIDATION!