Fixed couple of issues and added support for non-web apps