Resolves #49, Version 1.0.25