commented and clean up
Merge pull request #19 from 64kilobit/master

commented and clean up