updates
Merge remote-tracking branch 'upstream/master' into specs
adds sample spec
made it executable
merge conflict
removed unnecssary test files