Added validations. closes #12