Merge branch 't14_refactoring'

Ticket 14 done