This fixes the different indentation of the source files.

Additionally, the following issues are closed:

 - GH: #54
 - GH: #55
 - GH: #56