fixed #16
fixed #19
fixed #17
adjust bower components