Updated working version to 0.36