Merge branch 'morph-develop' into stoewer
Log: fixed bug in make_fqn
Merge branch 'stoewer' into morph-develop