closes #64
fixed #63
Merge branch 'stable'
fixed typo, reduced visual clutter