Merge pull request #106 from JustinRParker/dashboard

Dashboard fix
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merging