Changes to the structure of the library to guarantee consistency
1.2.0
Merge branch 'master' into gh-pages
Update docs