fixed annoying bug. it works now.
Merge remote-tracking branch 'origin/master'