Merge pull request #6 from Wohlstand/master

Merge pull request #6 from Wohlstand/master
Merge pull request #7 from Wohlstand/master

Merge 7
Merge pull request #8 from Wohlstand/master

Merge 8
Merge pull request #9 from Wohlstand/master

Update 9
Merge pull request #10 from Wohlstand/master

Merge 10
Merge pull request #11 from Wohlstand/master

Merge 11
Fix layer names not displaying correctly
Merge pull request #11 from jpmac26/master

Fix layer names not displaying correctly