Convert all indents to spaces (fix #70)
Merge branch 'dev' into feature/postgre