some testings later
Merge branch 'twistie' of https://github.com/jmkogut/winnie into twistie