- merged
- added spur basic configs for mac
new merge