Fix for RFC 248
Merge pull request #66 from mneumann/master

Fix for RFC 248
Merge remote-tracking branch 'upstream/master'