Upgraded default recipe a little bit to fix #111 and fix #112