Merge pull request #1 from meteor/devel

Trying to merge into awatson1978/meteor.  Hope I got the direction correct.