Bjorn
merge develop into master #cardmapr