Made Drakul more interesting (#168), worked on a few tests.
Merge remote-tracking branch 'origin/master'