Fix device_generator
Merge pull request #3 from chaabaj/device_generator_fix

Fix device_generator