Merge branch 'internship2014'