Changes made to parse parameters in correct order
Merge pull request #366 from rmanoni/jira_fixes

Changes made to parse parameters in correct order