first commit of this branch
Merge https://github.com/penoonan/The-Simple-LifeStream