PaintYourDragon Merge pull request #55 from CodeDelux/master