rangle/koast — pull request #12 by yuri (2014-09-09 02:40:59+00:00)
Title: Megamerge

Merging all the changes from what started as John's branch.