update specs, remove unused code
resolve conflict
Merge pull request #27 from th7/rspec

update specs, remove unused code