* refacting code based on PEP8 rule
Merge branch 'issue213' into develop