Merge working example

Now runs on OS-X