issue #225 done
Merge pull request #226 from darrudi/master

issue #225 done