Improvements on code
Demo project in another folder