merge with asterxie/bee master