Merge pull request #1 from fabianraf/preview

added preview
Removed preview
Merge pull request #2 from fabianraf/master

Update application