Merge branch 'pr/10' into TC-Community-2014-02-20