conflicting solved
Merge pull request #4 from thedgm/release/0.0.1.3

conflicting solved