Initial commit - fixed for Meteor 1.0