Fixed #94 (regression issue on Weather service due to big refactoring)