bartu 2016-12-26 merge #9

Closed borakrc closed 7 years ago