FIX issues: #169 (closed) #170 (closed) #171 (closed) #174 (closed)
merged
mentioned in commit 0b64f392