incorporated changes from up-to-date shell extension, fixes #13, #14