Merge dev > master

Fix for issue #25