visualcurrent Merge pull request #21 from omegakid1902/users/dutran/improve