Merge pull request #17 from cancerit/dev

Merge to master for 1.4.3 release
Merge pull request #18 from cancerit/master

Merge pull request #17 from cancerit/dev