Added support for other lamp models
Merge pull request #367 from Jack37/lamp2

Added support for other lamp models