First commit. v1.00 for live
Merge origin/master