Merge pull request #16 from eanplatter/master

dashboard