fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/44 and optimized code.
Merge branch 'master' of https://github.com/benliu723/FromlyAngularStrap