verification of last step added
fixed port config
TODO Statement added
fix path port
Merged 'dev'.