Updated to include code changes made since SVN repository backup