Merge pull request #4 from VitaliyMakarets/master

Lots and lots of bug fixes.
Updated spec syntax to match latest rspec version.
Merge remote-tracking branch 'histvest/master'