Form validation

Fixed #11