Merge branch 'angular' fix #14