Merge pull request #1 from minotaur62/20140916-b

20140916 b
With some rspec tests