cptnnick/F3 — pull request #16 by cptnnick (2014-10-26 11:50:59+00:00)
Title: Master

Will need manual resolving.