merged
fix issue #9
closes #11