rspec fixes
finish rspec fixes
Merge pull request #38 from stvauyeung/bug_fixes_1114

Bug fixes 1114