Merge branch 'ismb/2015_demo' into develop