Merge pull request #1 from bornkiller/lovestory

Ther first milestone version
Merge pull request #2 from bornkiller/lovestory

Merge pull request #1 from bornkiller/lovestory