Updated with new features!!
Merge branch 'master' of https://github.com/alexclp/FirstWinApp