Several features added
Final Version gini hackathon.
Merge branch 'feature/Parse' into develop