Concerning Issue #61 and more

Latest development to stable.