Updated
Merge branch 'bug_1214'