"Reopening" issue 36
Merge pull request #37 from jpf/master

"Reopening" issue 36