Merge pull request #61 from 0x1mason/master

1.4.2