Merge pull request #16 from cs27x/iter2

Iter2
Merge pull request #13 from cs27x/frontend

Frontend