Development bjorn

fixex #62 and #109