Issue67

merge *nix fix