cardoe Merge pull request #13 from remexre/master …