Angularized Fixes #9