Merge in Version 0.6 Changes