beta release
fix for issue #168
Merge pull request #169 from menny/master

Heading to r101