Some changes.
Merge branch 'master' of https://github.com/sbirk1983/application