reorganized and simplified
reorganized and simplified
fixed merge
Merge pull request #4 from IanChiles/reorganization

reorganized