master #7 add multiple baselayers suppport