fixes #3
resolve merge conflict
1.1.1