Merge pull request #238 from KubaKaszycki/master