Merge pull request #43 from StanculescuDaniel/master

This fixes #42 and resolves #40
Merge remote-tracking branch 'upstream/master'
This fixes #45