fixed #33 for v2.2.2
fixed #35 for v2.2.2, thanks to @boskijr
init for future versions
init for v2.2.2