Finish feature 1
Merge pull request #5 from ianks/ian

Finish feature 1