Version 1.0.0.5

Several improvements and fixes. See details in file itself