Merge branch 'master' of /Users/fabioneves/workspace/stamp with conflicts.
Adding availability feature.
Adding rspec