Merge pull request #1 from PirateBox-Dev/master

Update from original