Merge pull request #115 from pjft/pjft-experimental