App class
Merge branch 'refs/heads/app' into 0.3