refactor
Merge pull request #15 from DaveBlooman/updates

refactor