gypark's draft 2014-12-07
Merge pull request #69 from gypark/feature/draft-2014-12-07

gypark's draft 2014-12-07

++@gypark