Commit 1.3, submitted for Coursera 05/06/2014