Fixed #9 and  #19
Merge branch 'master' of https://github.com/mpfeil/OpenSenseMap