Fixed JARVIS-467
Merge pull request #16 from joola/feature/JARVIS-467

Fixed JARVIS-467