Updated to include some of 0.3.6 changes