From work Asus ultrabook
Merge branch 'master' of https://github.com/Intar/arduino