Updated
Merge branch 'pull_artificialrobot_20131213130456471'