Merge pull request #1 from BrokenROM/lp5.1

Sync with master