Merge pull request #18 from BrandonMcNary/master

fixed issues from rebase
fixed misc duplications