fix #1, #2: merged devel into master