Released version

Merging changes made to the publicly released versions