Updated for Version 0.4.1