Refactor code
Merge pull request #42 from jasondbaker/dev-jdb-05052014-2

Refactor code