Fixed #166, bump
Merge branches 'dev' and 'next'
Merge branches 'dev' and 'master' into next