fix
Merge pull request #23 from jmaas/master

fix