Fixed issue #114 and #135

2-space indents everywhere please.