DBoo/fix8 — pull request #12 by DBoo (2014-06-07 03:36:45+00:00)
Title: Dev

Sync to get latest from dev