Merge pull request #3 from eggrobin/Dev

eggrobin patch
Merge pull request #4 from eggrobin/Dev

Merge EggRobin patch
Fix #6.
Merge pull request #7 from eggrobin/dotted-smoke-fix-fix

Fix #6 (dotted smoke)
Merge pull request #3 from sarbian/Dev

Catch up with myself through sarbian/SmokeScreen.