First commit.
Fixed some path stupidity.
Merge remote-tracking branch 'origin/master'