rebase from master closes #1