see issuses #6 and #7