fixning merge
Merge remote-tracking branch 'upstream/dashboard' into dashboard
Merge pull request #106 from JustinRParker/dashboard

Dashboard fix