Release 2.0.5

Pull request for 2.0.5 release.

This includes fixes for #348, #347.

Please provide any feedback here.