Added some modifications; fixes #4