ticket:6 done
ticket:6 small cleanup
Merge branch 'ticket06'