Feature/iteration 4 dev codepro

only have line length problem complained no code break 
xwen2