Merge branch 'dev'. Version: 0.2