a little cleanup
Merge remote-tracking branch 'upstream/master'

original change
small changes added
stashing my change
contact minor changes
cleanup
Merge pull request #29 from sunnyLA4/master

cleanup