old unmerged changes on development #3

Closed kolov closed 7 years ago