Fix #119. Fix #120.
Merge pull request #121 from intellifactory/develop

Fix #119. Fix #120.