Nonstandardkeys

Another try for pull as per CornedBee request. Hope this one will work