nixilla Merge branch 'release/0.5'

Latest commit e0d17f0

Oct 9, 2013