Merge pull request #5 from DavidVorick/master

Merging and coupling to core.