Changed ArrayLists to Lists for not being implementation specific
Merge origin/master