refactor
include extensions
Merge pull request #73 from ryn0/master

refactor