Addresses issue #40
Improved indent folding