Fixed variable/method conflict
Merge branch 'master' of github.com:pegasus-isi/pegasus