merge modification from https://github.com/GandalfIX/java-faker