Merge pull request #76 from kariminf/master

Style managment