PR #23 #24 merged