merge changes from likastore:master into bgse:master

get my fork up to date