Final update!
Merge pull request #1 from euBatham/jorik

Final update!