Merge pull request #266 from amitapl/dev

Fix test failure when fullpath has a space in it
Re-indent files according to convention of the project (2 spaces instead of 4).