merged pdxfixit-master into master