scasBot/i4 — pull request #40 by chrislimsv (2014-02-27 00:16:58+00:00)
Title: merge

Some changes were committed to the master branch directly; this merge brings beta up to date