improve app
Merge pull request #1 from fs/some-improvements

improve app