Bug fixes
Merge pull request #2 from wraith228/bug_fixes

Bug fixes