Version 0.6 branch -- merge into master