Fixed the bugs, put summary comments in.
Merge pull request #39 from AlexReiss/master

Fixed the bugs, put summary comments in.