Fixes #133
Merge pull request #136 from j0r0/master

partial implementation of #133