feature empty list done
Merge branch 'feature/emptylist'