brunofacca Merge pull request #20 from nstoker/master