Merge pull request #77 from alex-deaconu/master

Fixing broken tests by adding alignment dependency
Making ngModel an optional parameter