Fixing issue #206. Values still need to be tweaked.