Major update fixed #6