added hashmap closes #1