fix __construct()
Merge branch 'develop'