2.5

major refactoring, fixed bug with JSON parsing