merge fix commit 5f88a4a
merge fix commit ebe434a
module API names update