Bugfix as mentioned in gist comment: https://gist.github.com/echong/3861963#comment-764551
Merge branch 'release/0.1.0' into develop