Bug Fixes
Bug Fixes
Merge pull request #28 from thebirn/bug_fixes

Bug fixes