Fix #6 Handle PC specific keys. Close #2