Re-designed acording to issue #6 and substituted some more sub-plugins