Finalizing changes, fixes #67