Fix Jarvis issues
Merge pull request #8 from swanncretin/fix-jarvis-issues

Fix Jarvis issues