Related to bug #15
Merge pull request #16 from CoolGoose/patch-1

Related to bug #15
Merge remote-tracking branch 'upstream/master'