Merge branch 'develop'
Bump to 1.0.1
Merge branch 'develop'
Merge branch 'develop'
Remove anonymous function in options class for PHP 5.2 compat
Updating to 1.0.2