Merge pull request #37 from ottxor/master