Pull from jdlitsky:master

recent commits into personal repository