Improvements made - See ReadMe