Fixing bugs
Merge pull request #7 from kellrott/master

Fixing bugs