Merge pull request #1 from GCStokum/master

Working Laptop pull post v0.1