fixed #12 issue and added data entry