Stuff to fix
Merge pull request #2 from holyprin/holyprin-mac

Stuff to fix