Preparing jarvis 0.2 branch