Applied patch
add array nd remove module check
applied interdiff from dawehner
fix docblock