Merge pull request #25 from candyforchris/master

PLEEEEESSEE
code clean up
Merge pull request #26 from vossgang/matt-copy

code clean up
Merge remote-tracking branch 'upstream/master'