fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/24
fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/24
fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/32
fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/33
merged code