Merge pull request #1 from learncenter2014/master

Update