code
Merge remote-tracking branch 'origin/task-14-3-2014'
fix bug