Merge pull request #8 from mrtur/2.X-EXPERIMENTAL

small fixes v2