Fix for issue #7
Merge remote-tracking branch 'origin/Next-Version'