small fixes
closes #30 + changes
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  closes #30 + changes
  small fixes