Modified to avoid using a List iterator, this should close issue# 49
Merge pull request #50 from smarthi/suneel

Modified to avoid using a List iterator, this should close issue# 49