* Fixes for puppet 3.2.1, unknown if it will brake for older puppet version
* Speed improvements