Update from tamboti 1.0.6