Style review 20131212
Merge pull request #3 from vladmaniac/unstable

Style review 20131212