Development diglin

Thanks to @diglin for this feature.

Merged the development branch only