Make extensions internal
Use implicitly unwrapped optionals
Fix merge conflicts
Merge pull request #38 from hpique/fix/minor

Minor fixes: use implicitly unwrapped optionals and make all extensions internal