Version 0.3.6 Update

See CHANGELOG.md