Commit 05/16/14

Version from the final presentation