Closes #31 (closed) and #32 (closed)
changed milestone to %v2.1.5
added bug confirmed labels
mentioned in commit 696f2ff1
merged