Merge pull request #267 from amitapl/dev

Re-indent files according to convention of the project