1.0.4
c153314f · Merge branch 'develop' · Feb 14, 2015