issue 16
merged with master