Updates for issue #31 ...
Merge remote-tracking branch 'origin/master'