removing stuff to fit 1hr
minor changes
Merge pull request #24 from khan4019/master

get latest