Fix Opening JSON #118
Merge branch 'master' into refact-2