alpha-0.8.7 + indent-fix