Initial functional commit.
Merge origin/master