chanjo integration
issue #249 - chanjo integration
Merge branch 'dev' - chanjo integration