Update of 2012-2013
Merge pull request #5 from dbetebenner/master

Update of 2012-2013