libraries from issue #38 + some others