Composer develop + bugfix