Initial commit for "master/quack" branch