reorganized and corrected some errors
Merge pull request #17 from 27001/asd-workingBranch

reorganized and corrected some errors