Update

* Add more data validation #18