Fixes #27
Merged upstream
minor fix
Merge pull request #51 from codeconsole/master

Minor updates