Fugue Changes

Minor changes
Merge pull request #367 from herrozerro/master

Fugue Changes