Added specs and docs
Merge branch 'marks' into danzimm