Issue 24

Related to #24 and #119