Integrating my fork back into master branch