Merged changes into fork folder