Close #42
Version 3.0.5