Merge pull request #23 from elElmo/master

Fixing merge problems