todon2o synced with n2o 1.5.0 and active 0.5
Merge pull request #1 from 5HT/master

todon2o synced with n2o 1.5.0 and active 0.5