Fixed few bugs with parse method.