Merge pull request #18 from snarfed/master

fix for constructor crash on 4.1 and up