Development version 0.5.8.2

Continued work