Merge pull request #99 from RWOverdijk/update/update_composer