installer and app code cleanup
Merge pull request #3 from bbest/master

installer and app code cleanup