indentation and adding ubuntu support