Added singleton to base classe
Fixed null as value problem with location:geo:type key list
Simple running tests and some timing comparisons
Running tests
Merge branch 'singleton'