issue 25
merged with master