First commit.
Merged with master, resolved conflicts with README and License.