indentations and made g++ support