Merge pull request #2 from 52North/develop

Merge with latest updates from 52North:develop
add null check in line 209 in the case of not finding the requested
phenomenon in the lookup storage
added todo
Merge pull request #109 from EHJ-52n/develop

Merge with latest developments from EHJ-52n
Merge remote-tracking branch 'jansch/develop'