refactored for loop and therefor changed the assignment of default values for the options object
fixed tabbing issues
minor refactoring
Merge remote-tracking branch 'upstream/master'
Refactored default options to more compact version
Merge pull request #5 from r3dDoX/master

Refactoring