ticket 4: done
Merge branch 'ticket_4'