Merge develop into master to resolve issue #36