Added data with JSON & few features.
Merge pull request #14 from Archon-/task6

Task6