Sync merge develop to master #161

Closed dorotatomczak closed 5 years ago