Fix issue with missing distribute package
Update pip command for pre release
Merge branch 'master' into develop