Merge branch 'devel' of github.com:jganitkevitch/joshua into cleanup