Merge branch 'master' into gnode-course-2013
fix id function to return string