Pre-release updates

Mahmood,

Would you like to merge some of the changes I've made to your app...Just about to create template for Marketplace entry.

Thanks,

Ben