commit d0ee242b3a617fa8676e56388ce01a8a676bf7d1 closes #107