Iteration0

Merging into master and preparing for feature-wise branches