code tideup and parameters load bug fixed
Merge pull request #9 from ManolisCh/develop

code tideup and parameters load bug fixed