Merge pull request #30 from BorisVerk/master

major clean up
made indentation consistent