some minor, some major
Merge pull request #261 from accessomat/master

some minor, some major [Take #2]