Fox-McCloud/Paradise — pull request #14 by Fox-McCloud (2014-09-07 03:20:42+00:00)
Title: Merge From Master

merge from master