Martin404 Merge pull request #4 from JavaNaive/master