Merge pull request #25 from Alerion/dashboard

Dashboard