Added basic validation

Please review @maciekbb