Commit #1
Update
Merge pull request #10 from hatchan/feature_branch_1

Feature branch 1 - 4 awesome!