Updated for version 0.4.9 beta