issue 50
merged with master