complete version for testing campaign on g5k
Merge pull request #3 from badock/development

complete version for testing campaign on g5k