chanjo integration. Fix for #494

Here is the integration with Chanjo. It was tested using the test only ChanjoPipeline

Also, this includes a fix for #494. A unit test is provided.

-jk
Are you using features from the development branch, or from a released version? If the latter, this should be versioned IMO.