Feature/16

Merge #16 and #24 to master.