changes that reflected updates from jarvis2
Merge branch 'master' of https://github.com/mallochine/jarvis3