Issue 23

#23 closes