Resolved #19
Merge