Tabs to spaces
resolve conflict for #63
Merge branch 'marian-r-tabs-to-spaces' into development