devel branch
ready to merge with master