Version bump to 0.3.6
Updated changelog with commits from 0.3.6