added nasty
Merge branch 'master' of https://github.com/nahidakbar/etdretrapr2014
added RandomStrategy
Merge remote-tracking branch 'origin/master'