Merge 0.1 - Luna into master

Finalized the changes needed to meet the milestone for 0.1.