merging master
fixing configuration issues