Merge branch 'master' of github.com:rstone770/inheritor