Further fixes
Further fixes
Merge branch 'master' of https://github.com/keexa/GettingAndCleaningData