Closed #69 with double buffering option