added constants separation. closes #191