Updated for version 1.2 of the library
Merge branch 'development'