Merge branch 'commsult-master'
added Type to ArrayList
use interface instead of impl