Correct indentation (same as master)
Aligned to master
Implemented O(n^2) method... need testing
Merge remote-tracking branch 'origin/smart-init'