0.3.5 dev #2