New upstream release
Fixed indentation and bugs