Added parsing
Merge branch 'master' of https://github.com/Rurigok/project-gemini.git