fix #2 and change return parameter List to Dictionary