syntax error from prev merge fixing
Merge pull request #95 from kordero/dev

syntax error from prev merge fixing