Added latest changes for verson 0.5