Use GetExecutingAssembly() instead of Environment.CurrentDirecotory

Closes #907