Updates from @landroni - fixes #2