Jik stuff

asdf
Merge pull request #35 from Vandenn/master

Jik stuff