incorporated chagnes from andrew and jen
Merge pull request #20 from arokem/pegasus

incorporated chagnes from andrew and jen