Modified some code due to use of container ...

The list now can store C types and and strings directly (without the
need of them to be in a struct).
Merge remote-tracking branch 'origin/list' into locations