antoyo Merge pull request #131 from antoyo/fix/stabilize …