Initial commit - replace 2011 version with the one from Bitbucket