Merge remote-tracking branch 'origin/master'
bugfixed
add code
add spec