Try to resolve generation2 issue
Merge pull request #24 from jnain/master

Try to resolve generation2 issue