TreeMap must be typed

remove error when building with 1.6 compliance
Merge pull request #1305 from treymarc/patch-1

TreeMap must be typed
Merge pull request #19 from ahcorde/master

update from droidplaner