Bugs fixed?
Merge pull request #52 from bobolinks-2014/Bugs_fixed

Bugs fixed?