v3.6.0

closes #46