[master] Iteration 1 complete [fixes #1]