Merge pull request #25 from project8/master

px1500 fixes from ignatius