Next iteration. Works single channel
Merge branch '2014-10-06' into develop