updates for week of oct6-10
bug fixes
more fixes
Merge pull request #28 from ysubtle/master

Bug Fixes