Small modification.
Merge branch 'master' of github.com:dbarella/csmc-2014-2015