merge with app logic
Merge pull request #3 from castamir/master

merge with app logic