Merge pull request #2 from tadpolecc/master

sync with tadpolecc
Merge pull request #3 from kcristiano/4.5

clean up master
Merge pull request #20 from kcristiano/master

clean up master