"duplicate" authors issue fixed
Merge branch 'master' into nook
Device enum
synchronization with master branch
Merge branch 'master' into nook