bug fixes and improvements for coming v. 0.5.0
v. 0.5.1
Merge branch 'develop'