Added pre-GitHub changes so far for 0.3.7