Merge pull request #1 from thecookiezen/master

Mergo from base repo
Add some tests for Optional.
Merge pull request #14 from rafos/optionalTests

Optional tests