Fixed issue #1
Merge branch 'library-modules-#1' into develop