Added some documentation + coding style standardization
Merge branch 'unit_tests'
Fixed some problems after merging