Merge pull request #11 from bjames105/master

Merging
Merge pull request #14 from bjames105/borami-branch

Merge pull request #11 from bjames105/master