fix unsupported constructs
Merge pull request #4 from soloman817/master

update