mbuscemi Merge branch '0.3'

Latest commit 5321d78

Jan 14, 2018