Merge Beta into Stable

Version 0.5.17 released