Code review and test maintenance
Merge pull request #2 from Solderea/unstable

Code review and test maintenance
Style review
Style review to make everything look nice.
Merge pull request #3 from erikakeresztes/unstable

Style reviewed