Merge pull request #13 from dkorolev/master

Added functionality and tests to FSQ.