Added @jczulian 's suggestions on PR #24