DOC: Update
Merge branch 'master' of git.assembla.com:chipwhisperer