RRC < 31 days + small fixes
merge conflicts
more mergies :gun: :moneybay: :dancer: :santa:
Merge pull request #239 from nens/arjen_hht_1month

RRC < 31 days + small fixes