Improved speed
Added more variations
Added an undocumented feature
Merge remote-tracking branch 'origin/master'