Fixed #2
Fixed #1
Removed method no longer needed and fixed method return value to be
templated array vs Object array