Bugfix
Namespace update
Removed exception
Updated composer