Alpha 0.3 DEV - Fixed bug