musselwhizzle Merge pull request #167 from rthochbe/D300