Mark Watkins - 2014-04-10

Sorry for missing your patch.. my emails got swamped.

Tested and committed to master branch.

I'm really not sure how to detect the field order of the machine variants. I really wish there was an easier way to do this. If you have any ideas on how to accomplish this I'm all ears.

Thanks for the patch.