Updated code
Merge pull request #3 from usbsnowcrash/master

Updated to use strategies