Delete unnecessary if else
Merge branch 'master' of https://github.com/djhvscf/flatJSON
Update CHANGELOG.md