Completed milestone 1
Merge pull request #105 from ignitesol/master

Milestone 1 & 2