Cherry pick keszybz master

Cherry picked version of #2. Omits the original 0c7d284 and adds a fix for the indentation level: 44b72bb