TEMP COMMIT (2013-04-21 Sun. -- after rebase on newly created 'master' branch)