merge mvp

Why do you want to remove the -Werror flag? It's usually a good idea to build with the highest possible sensitivity to the sort of questionable practices that compiler warnings flag.