Add MacGyver option
Merge pull request #309 from macflav/macflav-contrib

Add MacGyver option