bug fixes
fixed Rspec bugs
Merge pull request #6 from EmFoley/bug_fixes

Bug fixes