Merge pull request #130 from douginator2000/master

factoring updates