Commit 1
Commit 2
Merge pull request #1 from bendoran/1.0_Sprint_1

1.0 sprint 1