Fixed #12, added extra validation