Merge pull request #201 from brunck/master

Issue #170 and Issue #176 - Fixed.