Merge pull request #81 from SmokyBob/feature/material_design

Fixes Bugs #79 and #70