Better data sanitization.
Better data sanitization. Close #55.