fixes #39, fixes #40
Merge pull request #42 from cinovo/#39#40

fixes #39, fixes #40