Bug fix: finally closes #19, it was a nasty bug. FF bump to 2.2.0