Updated documentation and specs.
merge branch 'test'