added JSON
implemented API
changed simple things
Merge branch 'feature/first-implementation' into develop