Fix issue #14
Fix issue #13
Fix issue #6
Fix indentations.
Merge pull request #15 from Pasvaz/small-fixes

Fix issues #6 #13 #14