Manually added changes from originals commit #81

Because I dont know how to merge forks through the ui.