Merge johmanx10 master with Hotelsnl master

@CyberSecutor