Added updates from original repository