Pull request for merging dev into master for version 0.5.7