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

Code review and test maintenance
Style review