Fixed conflicts
Merge pull request #15 from friccita/master

Fixed conflicts