Adding files
Merge https://github.com/iboxgithub/meteor1