bs2609/fs2 — pull request #2 by bs2609 (2014-04-11 19:48:48+00:00)
Title: Merge fixes

Minor fixes and code cleanup